bug fix: regular return