Fix last time pushed logic problem