Fix case clause evaluation