Address undefined message issue. #3