Handle mod d/c

@metakirby5 please review :jack_o_lantern: