0.4.7 compatibility
0.4.7 compatibility