diff --git a/autoload/emmet/lang/css.vim b/autoload/emmet/lang/css.vim
index 448299f..c0520c5 100644
--- a/autoload/emmet/lang/css.vim
+++ b/autoload/emmet/lang/css.vim
@@ -19,7 +19,7 @@ function! emmet#lang#css#parseIntoTree(abbr, type)
   " emmet
   let tokens = split(abbr, '+\ze[^+)!]')
   let block = emmet#util#searchRegion("{", "}")
-  if type == 'css' && block[0] == [0,0] && block[1] == [0,0]
+  if emmet#getBaseType(type) == 'css' && block[0] == [0,0] && block[1] == [0,0]
     let current = emmet#newNode()
     let current.snippet = abbr . " {\n" . indent . "${cursor}\n}"
     let current.name = ''
diff --git a/autoload/emmet/lang/scss.vim b/autoload/emmet/lang/scss.vim
index c79c5c8..48fe918 100644
--- a/autoload/emmet/lang/scss.vim
+++ b/autoload/emmet/lang/scss.vim
@@ -1,5 +1,5 @@
 function! emmet#lang#scss#findTokens(str)
-  return emmet#lang#html#findTokens(a:str)
+  return emmet#lang#css#findTokens(a:str)
 endfunction
 
 function! emmet#lang#scss#parseIntoTree(abbr, type)