13th commit - prevent duplicate register