Fix bug #338