Bugfix: CHOREGIEREFAPP-108