SM 1.5.0 compatibility