Fix bug introduced by prefix support