Dirty fix for automatic tasks and tasks