Fix work stop when issue is working and tweak some code