fixing async and drag