Just patching the data code to make it not crash out