Fix for trips feature