Fix for tracker community