fixed for 1.9.x