...
Fix #444 for mainline