Bandaid to fix a crash in our code