Fix to work with trail pipes