Bug with different register fixed