fixed stupidest bugs in the history of the world
(#389)