solve #36 and #62