Fix fix. Should refactor whole task system