Fix for not handling mixing of @ and $