fixed basket timing issue