For issue 372 (costs)