Actually fix 'stuck' bug this time.
Seems t = 1s was too optimistic for 'stuck' bug fix.