fixed global issue