Bug fix for 1.8 updates