Improved on Null body loop bug.