Fixing default behavior