fix for pulling logic