Better logging to debug #145