POST Safe check added