Fix for debug duplicate message