Fix slow execution