Resolving #373