Reverted back to version that works.