Removed recursion from fix #309.
1 file changed