Fix bug fixed in trunk