Potential Attack Bug Fix - Note if this bug happens again after this commit