Address undefined message issue. #2