Fixing #41