Fixed broken overriding system!