replaced @literal with @value