Fix for 0xc and 0xd events