Fix for parse