fixed #20 =_=