Undefined index fix. Issue #65