fixed global issue [in a way...]