[DEV] Better reliability