Fixed to work without images