Build Fix for Issue #476