Resolving #52