Issues #3, #5 and #8.