Fix for 1.5