minimal fix for #361