Fixed an issue with the body pop order