WIP fix for issue46.