Reinstate code after toObjectString fix