Fix list_cluster in non blocking mode