finish this bug fix