Fix for the parser