fix for #392 Part II