Fixed an annoying bug [#MB-4 resolution:1]