Continued tweaking for fix