Extra cycles executed.

Fix #3979 & #3883.