Fix build for 1.7