updated for fm.fastmail.dfay.codecase version: 1.2