Issue 63 fix