#519 better logging