fixed pull-push disasster 2