Fix for this issue and ticket
This is already hotfixed in production by Thomas K.
@kluyvert @schmidtp