Fixed for merge