Issues #159, #173