Fixed registration, again