removed safety check