Fixed 1.8 compatibility issue
1.9 release update