one last bug fix before merge