Braid - fixes #476