Fixing defaults expansion