Minor bug fix 3