Following recommendation in #28