performance bug fix