Minor bug fix update