Ok! I'll fix this specific case in this pull request and then other ones in a different pull request.