Fix for authoritative data, closes #87