Fix for 831f2de