fix on registration