Fix for 1.87