Fix for 1.7.10