Minor speed optimization