Fixing else conditions