hopefully ready for 0.4.4