Reverted back to revision 1.11. The previous fix doesn't really fix