bug fixed #15