attempt to fix #732