Fix #99 partly - awaiting something better