change for 1.8.7 && 1.9.3