Fix for PR1306.