Changed defined per string fixing to a string