Bugfixing pure :-)