Possible fix for multiple controllers