Reverted some changes, image checking forced on every run