Copy JSON behaviour even closer
0.6.11