FIX: errors in new client