Reverted back to previous version until have chance to fix bug #21