Resolving #174