fixed #62 merge issue