bug fix as a result of merge