Fixes issues #16