merge in fix for normal maps