Fixed prefix/suffix bug