Bugfixing marcel