Potentially resolved

Needs strong testing