fixed pull-push dissaster