Interim fix until #461 is addressed