Another fix for multiple controllers