Try to fix broken annotatation data manipulation