Temporary fix for annotations