Fixing weird overridden feature