Fixed task issue