Fix to bypassing registration