reverted to more tolerant DSL