change fix to match the official bugfix from CloudMade