re #123 - fine tuning