Fixed problems with expand syntax.