[MOD] Fixed for merge