#195: better logging