bug fix on complicated