tested against 1.7 now