Fix 2 to v0.7.4