Hopefully fixed closestwayfocus, test is coming