Yet another improvement