Fixed broken removing