Dumb security stuff
fixed?