Fixing repeated data declarations being ignored, closes #61