interim fix for #1