Improves handling of reserved characters