make 1.5 compatible