BUGFIX: constant string issues