Fixes #183 :)