That should reduce the cases of wrong portrait lists.