Issue 24 fix