Now handles modes=4 correctly (i.e. at all)