Fixes #100,#96