Fix issue with adding/removing files