fix the stupid 2-time iteration issue