diff --git a/autoload/phpcomplete.vim b/autoload/phpcomplete.vim
index f24b404..bbe1365 100644
--- a/autoload/phpcomplete.vim
+++ b/autoload/phpcomplete.vim
@@ -274,6 +274,8 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 		" }}}
 	elseif context =~? 'implements'
 		return phpcomplete#CompleteClassName(a:base, ['i'], current_namespace, imports)
+	elseif context =~? 'extends\s\+.\+$'
+		return ['implements']
 	elseif context =~? 'extends'
 		let kinds = context =~? 'class\s' ? ['c'] : ['i']
 		return phpcomplete#CompleteClassName(a:base, kinds, current_namespace, imports)
@@ -1208,7 +1210,7 @@ function! phpcomplete#GetCurrentInstruction(line_number, col_number, phpbegin) "
 				\ '!', '@', '%', '^', '&',
 				\ '*', '/', '-', '+', '=',
 				\ ':', '>', '<', '.', '?',
-				\ ';', '(',  '|', '['
+				\ ';', '(', '|', '['
 				\ ]
 
 	let phpbegin_length = len(matchstr(getline(a:phpbegin[0]), '\zs<?\(php\)\?\ze'))
@@ -1317,8 +1319,8 @@ function! phpcomplete#GetCurrentInstruction(line_number, col_number, phpbegin) "
 
 	" there were a "naked" coma in the instruction
 	if first_coma_break_pos != -1
-		if instruction !~? '^use' " use ... statements should not be broken up
-			let pos = -1 * first_coma_break_pos + 1
+		if instruction !~? '^use' && instruction !~? '^class' " use ... statements and class delcarations should not be broken up by comas
+			let pos = (-1 * first_coma_break_pos) + 1
 			let instruction = instruction[pos :]
 		endif
 	endif
diff --git a/tests/CompleteClassName_test.vim b/tests/CompleteClassName_test.vim
index ac0cfb5..f92a7b5 100644
--- a/tests/CompleteClassName_test.vim
+++ b/tests/CompleteClassName_test.vim
@@ -125,7 +125,7 @@ fun! TestCase_complete_classes_from_built_in_classes()
     \   'name': 'FindMeFoo'
     \ },
     \}
-    " the completion should give the value of the 'name' property regardeless
+    " the completion should give the value of the 'name' property regardless
     " of the outer dictionary keys
     let res = phpcomplete#CompleteClassName('tra', ['i'], '\', {})
     call VUAssertEquals([
diff --git a/tests/GetCurrentInstruction_test.vim b/tests/GetCurrentInstruction_test.vim
index 5e49b57..fb221d7 100644
--- a/tests/GetCurrentInstruction_test.vim
+++ b/tests/GetCurrentInstruction_test.vim
@@ -139,5 +139,11 @@ fun! TestCase_returns_instuction_string()
     call VUAssertEquals(
                 \ '$foo->',
                 \ res)
+    call cursor(96, 48)
+    let res = phpcomplete#GetCurrentInstruction(96, 48, [1, 1])
+    call VUAssertEquals(
+                \ 'class Foo extends Bar implements ArrayAccess, It',
+                \ res)
+
     silent! bw! %
 endf
diff --git a/tests/fixtures/GetCurrentInstruction/instructions.php b/tests/fixtures/GetCurrentInstruction/instructions.php
index 171dade..38fcf41 100644
--- a/tests/fixtures/GetCurrentInstruction/instructions.php
+++ b/tests/fixtures/GetCurrentInstruction/instructions.php
@@ -92,3 +92,5 @@ public function bar()
 ;
 return $foo-> // cursor here
 ;
+
+class Foo extends Bar implements ArrayAccess, It