To be fixed in #1493