Fix double strings issue