Bug fix and tiny optimisation