bug fixed #12