Fix for 1.5.8