Not using recursion fix #27