D7 Fixing [#2258167]