Recalculate currentSet before storing it (#5)