Attempt to improve forward-compat