Issue 59 - bug fix