Fixed #444. There was an uncontrolled recursion call in the new implementation... Closes #444 See merge request !153