Fix for string interpolation