fixed DSF issues