Hotfix optimization

********** DO NOT MERGE **********