Fixed overlapping annotation issue (hopefully)