New look and fix for #739