Fixing [#2334511]