Fixes closes #13