Fixed very dangerous issues

Thanks for focusing better next time