CT-8 fix for issue

Description CT-4