Added additional check for body_short