Fixes [#2360311]