Temporary solution for this bug - https://catami.atlassian.net/browse/CAT-769