Fixing small tracking bug