Confirmed fix from Marek for #xambug 8320.