Address undefined message issue. #5