Fix correction plugin / resolve conflicts
Merge pull request #229 from daboross/patch-fix-correction-plugin

Fix correction plugin conflicts