Minor amendment and bug fix.