Fixed an annoying bug [#TMS-20]

Fixed an annoying bug [#TMS-20]