Fix up with gear