Last fix for 0.4