Re-added code dropped in merge (by mistake)