fix periodic bugs

Change-Id: I24773db5c451cd0ff32b2c32b54accfc95a33f47