Last fix for v0.4 Release