Fixed an annoying bug [#CIN-1]