Minor efficiency improvement