worker bugs fixed