Fixed production logging handling