Make tracking work correctly