made bug fix more consistent