diff --git a/server/src/connection.ts b/server/src/connection.ts
index b40a053..c360c6c 100644
--- a/server/src/connection.ts
+++ b/server/src/connection.ts
@@ -7,8 +7,8 @@ export class BranFlakesConnectionManager {
 	
 
 	constructor(protected connection: Connection, private validator:typeof validateTextDocument, private documents:TextDocuments<TextDocument>, private settingsManager:SettingsManager) {
-		connection.onInitialize(this.initConnection);
-		connection.onDidChangeConfiguration(this.onDidChangeConfiguration);
+		connection.onInitialize(this.initConnection.bind(this));
+		connection.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this));
 	}
 
 
diff --git a/server/src/server.ts b/server/src/server.ts
index a256224..0738481 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -21,9 +21,6 @@ export let connection = createConnection(ProposedFeatures.all);
 // supports full document sync only
 let documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument);
 
-let hasConfigurationCapability: boolean = false;
-
-
 
 let globalSettings: BranFlakesSettings = defaultSettings;
 
@@ -34,7 +31,7 @@ let cm = new BranFlakesConnectionManager(connection, validateTextDocument,docume
 
 
 export function getDocumentSettings(resource: string): Thenable<BranFlakesSettings> {
-	if (!hasConfigurationCapability) {
+	if (!settingsManager.hasConfigurationCapability) {
 		return Promise.resolve(globalSettings);
 	}
 	let result = documentSettings.get(resource);