Removed error-inducing "feature"