Solves registration bug