Corrected issue with where incorrectly modifying self