Fixed issue and added log