Fixed. Wahoo This PR was very difficult ;) Sorry.