Bug Fix with prefix and specials characters