Fix for TypeError #25