Important 'undefined' fix