attempt to support 1.7