Fixes #101 - Prevent stackoverflow