fixed and pushed