Restored sourcing lib/trap