Refresh fork for MyDMAM #5 issue