[INTERNAL] improved handling of experiment end case