Quick hack to improve greatly performances