Fixed parity issues