Bug fix with Wait delay & chasing again