a little improvement to previous commit