bug fix during PR review