try to preserve storage format