Hope this is a fix for #3703 and #3761. @peller