Fix switch element for ff 24