Fixed possible character issue