Fixing else handling