Add more logging
Fix