Minor return value bug fix