Fixed bug with suffix in certain cases