Fix up #1