Attempt #2 for backwards compat
Fixes
Fix merge