made core 1.7 compatible