One more slight optimization