...
Fix #324 in mainline