Fix empty cases