Fix bugs in DSR