Fixed issues with parsing