fixed to no longer include strings