Bugfixing in process