added very important safety fix