[Fun] Issue #202 -- more fun when finishing!