Tweak a bit more - attempt to handle bitstrings properly