Issue 70 fix