1.8 compatibility added.