New fix with try