bug fix in progress