More likely to work attempted fix for #1097 - I forgot something important, missed a class in the list that needed patched. Oops? Also, capitalisation is difficult.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>