Fix for possibility of partial spans