Handle trash() better