fixed to remove potential corruption