Attempt at fixing pull problems