#45 Fixing final vals in annotations