Fix for parsing