SQUASH ME: address comment by @kijewski