performance partial fix