merge test fix from Barry