Fix for 1.8