little improving (wait until future done in proper way)