Final commit on that issue I hope