Right fix for 1.0 compatibility