Fix for an Issue #463