bug fix in new dev