Issue LOOP-14 by tj: Remove quotes from value