Fix bug #399