Fixes

fixes #13