Possible fix for mismatch bug on ships