Fix for Issue #463