More work around #85