Fixed apply defaults issue