bug fix in delayed mode