A quick fix for #774 (in main code).