fix bug with custom prefix/suffix