Fix for parser