Issues #75, #153