Issue #2137273: Really fix the issue :|

Sorry, the previous commit didn't completely fix the issue.