Attempt to fix integration with Tracksys problem