I agree that this is a tight spin. I left it as it was, as that seemed to be the intended (although shaky) behavior, but I will happily change it to avoid the tight spin. :-) New commit coming soon.