Quick fix for bug #463