Jrcportal 1150

Bugfix for #1150