update to fix last hitting