Simplified code for <1.3 compatibility