Bugfix from develop for docker building