bug fixing performance improvemnt