Added a dirty fix to the trail bug