Resolving #63