resolved #62 #61 #59 #58