Fixed bug with trips