Fixed possible problem in the future