* small fix that may cause unexpected exception