Fixing possible privacy leak