removed unsafe use of this