Fix for old registar