Reverted back to 3.0.12