(v1.0.4) Fixed 2.3 compatibility issue