#resolve DRUP-5