Related to #474, to ease contribution.
Related to #474, to ease contribution.