Fix for work submission