Bug fix: return value