Logging mechanism fixed