Another little improvement