FCTWO-197 Bugfix