Fixing implementation issue.