Fixing EL-221 not-spots issue.
Working on EL-221