Best fix possible