Minor bug-fix (not switching datasets when it's corrupted)