A bugfix and another change to help performance a bit if you have the controllers turned off.