Patch + workaround worked for me