Initial / untested 1.7 support