Fixed condition for default properties