Bugfix for https://catelproject.atlassian.net/browse/CTL-539