New fix (not tested)