Fixed mechanics changing behaviour even when disabled