Resolving #271