Fix bug #441