fixed: #63, #62