Resolving #45