Fix for missing return