CE-993 Much more elegant solution