Fix scope for 1.8.7