Crucial update - fixed race condition with route key