Fix for Issue #123456 - Undefined index