security fix from Agel_Nash