some fix for 0.4.2