Have more class
Respect prefix when returning new comment location