Fix 1.5 compatibility issue