Fix build (1.6)