A rapid version trying to cover some newly discovered situation