Bug fix for bug #421