Fixes issues #1