Fix for previous commit

Tried to handle two syntaxes at the same time. Bad idea.
Handling the two different syntaxes separately.