D8 - Fixing an error related to [#2203407]