[fixed] potential infinite loop during transitions

fixes #117