Issue306

@rtsio let's include this on the necessary controller instead of all of them.