Fix problems with short delta detection