Make it backward compatible