Revision for #160