Texture fix
Merge