solve issue #61, #62