bug fix on From