Add logging to figure out the cause of #30