Add issue 80 code