CF #23 - Comment and test