fixed stackoverflow during disposal bug, dogfooding ftw!