fixed #61