Bugs fixed in translator()