temporary fix + test for #671