Fixed issue: Added missed return