This is actually for #1487