Instead of me trying to fix that in this pull request I think we should do another fix after I merge these changes then.