#98 replace const with string