Patch for some data types not being able to decode... I need to do a proper fix later