Updated to maybe make a better fix