#140 minor improvement