Merging PR #68: Auto advance widget bugfix