and fix the fix for the descriptor loading