Allow remove = false
0.2.4