Fixed bug with helper functions.
5.5.3