Issues #89, #90