Bugfix: ODFOREA-910