Fixing overriding issue