short-term fix for stopping depending on the old annotation code #3