fix for #385