Fixing prefix issue