Merge "Prevent "Undefined offset notice""