bug fix on merge