Fixing faulty Default logic.