Bugfix for bug report THRONE-25.