Address undefined message issue. #6