added support for special characters