added: initial 1.8 support