u/fjammes/dm-1338

Reviewing DM-1338
Ok, I look for an other solution. 
Would you have an idea please?