Actually fix trap