Optimized version

Hi,


I also met the some problem for klein-gordon.