push & fix