Fix comparability