better support across all versions