Revise empty cases