Fixed auto work creation