Fix bug #398