D8 fixing [#2144463] (again)