[#589] minor improvement/optimization