performance bug solved