Don't use the dirty fix anymore

proper asynctask