Fixed bug CHOT-77

I've fixed bug CHOT-77, please check it.
Thanks.