Added Body type check