Debug logging, and commented out possible fix.