Attempt to fix off by one clock issue