Address undefined message issue. #4