Fixed duplication issue with pick up machine event handler