Setup for #734