Hopefully fixes the issues with using multiple identical controllers. #585