Fix quotes casuing issues
Fix quoting of variable