Re #1218 version