Fixed a well hidden StackOverflowException. amadornes: facepalm engage