Fix security issue from #44