Reverted back to 1.1.6 temporarily