Possible fix for discussions/400284