Fixed an annoying bug [#18]