Return and bug fix