#285 minor improvement