Fix DxS being a dick (I wish)