Global registry fix