okay, submitted patch at #597