Yet another fix to handle weird p-codes