r4897 Fix #500 in trunk