Try again to fix lazy functions