0.4.7 compatibility