Issue 63 fixed