fix global issue