Make it compatible with ss 3.1