work_handler bugfixes