Fixed an annoying bug [#ON-19182 transition:31 resolution:1]