Register and translation fix