Applied patch (2/19)

Applied patch