Fixed register redirect loop; Workaround for RiCal bug #41