Fixing stuff for multiple controllers