Fix issue with prefix removal