WT-111 - it should fix it