Added some logging for troubleshooting