bug fixed #13