A try to improve performance