A fix for the Stack Overflow exception I was...

... having.