Fixing store image issue