Fix for Opcode Filtering

Fix for Opcode Filtering