Fixing #305