CON-1446 | Bugfix try 1