#10 Fix security leak and fix timeout