Resolving #53