better shaping checking logic