Big fix when there is variable length slots II.