Small tweak wrt. to lap ID