WIP fix for #27