Bug fix: skipped images + ordering