Fix duplicate registration