Fixed possible suffix problem