put back 1.8 compatibility