added 1_48_0 support