Improves compatibility with existing implementations