Concerning #598: Fixed bug (interdependent auxiliary functions)