Added logging to better debug #630