Attempt to fix the command registration