Minor improvement!