Probably related to #3268 