Reverted back to 0.4.0