Fixing wrong defaults processing