Made backward compatible with <1.5