bugfixing parsing