A further bug fix