Resolved #23,#24