fixed wrapper removal