This should defenitively fix security problems