Issue 5 fix.