trying to resolve #41