fixed #20