small bugfix and fixed special char problem