Resolved #20, #59