Correcting #3285