Small change and bug fix