Fix bug 428