SQUASH ME: address @thomaseichinger's comment