Fix for 1.6 & 1.7