Issue 23 fix