Fix for pass prefix