0.6.0 compatibility
0.3.1