[0.4.4] fixes bugs