Fix for not escaped variables