Fix for trapping.