Fixing image bugs