Register crash fix