Display order bugfix