Issue 67 fixed