Resolving #22