More fixed for #2228