try to fix registration, but nevertheless buggy