hacky solution for end of set weirdness