(partial?) fix for #918