Fix bug #430