This could make serialization work out of the box, but may have other unintended side effects. See #148