Updated to prevent unwanted output to logs