modification for 1.5 branch