NNIS-1489 Bugfix
