Fix build issue on 1.8.7