Yet another optimization