Try to fix SITRACK-94