Properly track SJOINs