Fixed with queue and no exception