Issue 4 fix