Bug fix in 'working' count