Add #74 and #75