Yet another tiny improvement