Bugfix for already merged branch BACKLOG-1053