another try and sorting out the issues around #124