fix to have explicit return instead