DX-500 bug #1 fixed - clean up