fix for multiple controllers