Fixes [#2038301]