Fixing #31