(hopefully) added 1.8.* support