(ugh, too much hash-like fixing on non-hashes)