Fixed derp that could result in StackOverflowError