backward compatible with 5.10