Some fixes in overrided method