Fixed bug ha None sometimes