minor edit for compat
merge