Further work on #27