Should fix problem cause by previous tidy-up

@anguss00 as per our discussion with @pmbohm this should fix the problem caused by my previous commit.

There is some more tidying of the inheritance hierarchy of these controllers that can happen now but I'll leave that for the time being.