Resolution of #41