Closes #214 - Destroy causing stackoverflow