Fix for 1.6