[Global] Fix #147