Trying to support 1.7