portfing fix for #221