Bugfixing Jira:BSD-41 and 42