Fixed #778 - stack overflow.com