Fixed 2.7 support