Fix uncaptured removal