Fix roll enabling/disabling