this fixed #1, but new issue camed up.