Fixes closes #41