Added flags for ZH #169