Patch 3

Right, all local tests passed.
Sorry for all the hassle, it's my first time submitting a plugin, and thank you for the assistance.